From: Ray Strode <rstrode@redhat.com>
Date: Tue, 15 Mar 2011 19:19:58 +0000 (-0400)
Subject: gdm: fix empty real name check
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8649
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=735397aa896fe91e54b8210d535e9fa28a8d9109;p=gnome-shell.git

gdm: fix empty real name check

gdm_user_get_real_name() checks for an empty real
name and automatically falls back to username if
real name is NULL.  It doesn't automatically fall
back to username if real name is empty, however.

This commit makes it fall back for both cases.

https://bugzilla.gnome.org/show_bug.cgi?id=644765
---

diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index 735c2cb74..0a592cc6a 100644
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -407,7 +407,9 @@ gdm_user_get_uid (GdmUser *user)
  * gdm_user_get_real_name:
  * @user: the user object to examine.
  *
- * Retrieves the display name of @user.
+ * Retrieves a displayable name for @user. By default this is the real name
+ * of the user, but will fall back to the user name if there is no real name
+ * defined.
  *
  * Returns: (transfer none): a pointer to an array of characters which must not be modified or
  *  freed, or %NULL.
@@ -417,7 +419,12 @@ gdm_user_get_real_name (GdmUser *user)
 {
         g_return_val_if_fail (GDM_IS_USER (user), NULL);
 
-        return (user->real_name ? user->real_name : user->user_name);
+        if (user->real_name == NULL ||
+            user->real_name[0] == '\0') {
+                return user->user_name;
+        }
+
+        return user->real_name;
 }
 
 /**